merge emacs-24
authorKenichi Handa <handa@gnu.org>
Fri, 14 Sep 2012 11:50:54 +0000 (20:50 +0900)
committerKenichi Handa <handa@gnu.org>
Fri, 14 Sep 2012 11:50:54 +0000 (20:50 +0900)

Trivial merge